last commit had a few bugs. Fixed it now.