Fixed some bugs. Trimmed project size.