Improvements2

[syncopika]

• added type hinting! hopefully that'll help a bit
• also cleaned up a bit in a bunch of places. removed a duplicate method as well.