Added new demo parts and fixed several bugs