Controls added, fixed errors