Fixes many little bugs partially due to new methods