Changed handling of size changes,
timer hack removed